From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 25 Jun 2009 11:59:46 +0000 (+0100)
Subject: tools: fix x11 check
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13692
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=a8ccb671c3777e3bb6416a1624b6aa9d7185dd1c;p=xen.git

tools: fix x11 check

X.org is installed in /usr/X11R7.
Attached patch covers this in the x11 check.
Xen has no direct X11 dependency
(it's inherited from SDL and SDL is optional for qemu-dm)
so warn but don't fail if no X11 is installed.
Fixes build problem on distributions which build their packages (*BSD
and Gentoo).

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
---

diff --git a/tools/check/check_x11_devel b/tools/check/check_x11_devel
index aab7e42cda..8b7df98400 100755
--- a/tools/check/check_x11_devel
+++ b/tools/check/check_x11_devel
@@ -5,4 +5,5 @@
 
 has_header X11/keysymdef.h || \
 has_header /usr/X11R6/include/X11/keysymdef.h || \
-fail "can't find X11 headers"
+has_header /usr/X11R7/include/X11/keysymdef.h || \
+warning "can't find X11 headers"
diff --git a/tools/check/funcs.sh b/tools/check/funcs.sh
index d3fb60abb3..095dcb1ad2 100644
--- a/tools/check/funcs.sh
+++ b/tools/check/funcs.sh
@@ -78,6 +78,11 @@ check_sys_root() {
 	fi
 }
 
+warning() {
+	echo
+	echo " *** `basename "$0"` FAILED${*+: $*}"
+}
+
 fail() {
 	echo
 	echo " *** `basename "$0"` FAILED${*+: $*}"